fundamentally working commit with some ui changes
fundamentally working commit with some ui changes