Cleaned up dependancies

Using more of my own stuff
latest build
removing loading