Added Connor's changes before bad and tag

"My" version of the code is now inside a different folder.