Commit 1d1da9cc More structural refactoring I am really running out of ways to basically describe the same thing.