(Semi) Final Upload

Squashing final bugs