Sumanth

Refatored actions to be more modular.