done some stuff, ui almost there