Refactor complete
Ignore tags
Merge branch 'refactor'
Lots of features and goodies