Refactored internals, working UI
Missing files