wip: push more code to bitmap handler