#47 wip
#47 move to dynamic pointcat