first commit of broken code
fixed stupid brokenness
messing around with merge
removed debugging code