wip: refactor stuff
tmp: descriptions and todo
wip