Beginning to change how the pieces are creatd.  Commiting to have a revert in case something goes horribly wrong.