Still have some work to do and some decisions to make on how I handle some stuff but it's coming along nicely
