updating TODO
restructuring things, moving things arounds to models, controllers and services"