move stuff around
removed static stuffs