Commits squashed, files cleaned up, and rebased by Adam Honse <[email protected]>
Commits squashed, code style cleaned up, and manually rebased by Adam Honse <[email protected]>