Moved variables around and renamed a few, verifying ignore file as well