Added a few touch up pieces of code. Need to really think about this now