First commit, UI is coming along