#31 Part two attempt

This is going to be reverted..