Cont. (added UI, need to refine actions)