Major push

Tons-o-shit fixed