Tested more code, still bugged