Reuse some code instead of duplicating it
Rewrote saving directly on context to make it harder to screw up :)