lil refactor plus some primitive controls