wip: slightly better, and working calcsize