The biggest merge request ever know to man kind.
merged
mentioned in commit c690437f
Feel like merges of this size should be taken on meetings because its so big, but ill let it slide
