finished up refactor
Merge branch 'master' into retroact
making progress on register