Save state functionality



<!---
@huboard:{"order":1.0,"milestone_order":67,"custom_state":""}
-->