moving more code

moving more code; free commit. whatever