Updated commit - - - UI coming along well