Last Commit of the code

Last Commit -- the UI should demo-able