squash-commits

Review all changes (commits and working changes) and organize into appropriate commit granularity