Massive Commit

This better fucking work... Everything I have done in the last few
months.