WIP: beer song passes :: next step refactor