Restructuring! And commmitting way too often!