UI now mostly functional
a