Removing some debugging and stubbing out things that need to be improved in the next 24 hours