okay this time i really grep'd and refactord ._.