Refactor to simplify
Merge branch 'master' of https://github.com/wayneseymour/nina-research