ui working, only thing remaining is tests