UPDATES

Reworking of functionality, adding a BUNCH of stuff