Cleaned up solution after rebasing, merging branches, and merging repositories. Also fixed references.