lol huge commit. will try to be more... correct next time.