moved stuff
A bunch of stuff to go to SPA architecture