Migrated from actions to commands & handlers. NOT DONE, SQUASH?