Revert "Revert "Checking in crap""

This reverts commit e9f0555951934161528701aba0a2ad79f99b1160.