fundamentally working commit with some ui changes