GRRRRR

Ok time to take another crack at it.

I think I know what the problem is, and hopefully the change doenst mess anything else up