Refactoring

Would like to do more, bulking out MVP features first