MVP Feature Complete

Finished out all the major required features