wip on code 2 stuff