Initial commit of separate quick-entry controller