Cleaned up through 2.2
Merged