Friday merge

Bringing it all together so we can sling some more codez!