ui
preparing for controller refactor