UI working, working on fixing unit tests