line 335ish, thats sort of where we need to fix