Stage act and draw in base class
Merge branch 'master' of https://github.com/dmayboroda/crab