squash This is a combination of 62 commits.

https://github.com/Metallicow/Phoenix/tree/library-branch

There is only about 10-15 small missed unnecessary whitespace lines changes.