Commenting out things to build what I hope is the starting point