moar WIP stuff, still not finished *imsolazy*