dev: complete rewrite
dev: uprev