Developer 515

Reverting the revert, also comment out the pry debugging things.