Updating to 1.7. Code is a nightmare and may not even work anymore.