Comment by whywhywhywhy

Would be much better if these changes were a branch on the starting repo rather than entire refactors with many changes.