Almost have UI working