Final commit for McHacks