lots of refactoring, to helpers. got compose w/ maps working almost