tenuous fix to shift+draw on entities - need to rewrite