threw optimization back in; forgot how much fun this stuff is :D