I needed to rewrite the code in these files because I'm a moron and gitted myself into a ton of trouble earlier today with the previous commits.