UI Appears complete

Now just to integrate