refactoring, let's see what i broke
Merge branch 'master' of https://github.com/mteaster/test