Lots of changes, UI being created as well