Fixed a restructuring bug
Placeholder for homework 2