Cleaned up the code a bit, still need to do a ton of refactoring.