Feature/stuff

heh derp