First version of very rudimentary separation of concerns