cleaned this up a lot more, it's looking good :D