Cylinders up in the house

Ready to submit for CP2