Almost there

Still need to clean up front end UI