9/20/14

New Ui / mad refactorage, gotta redo the lot