Remove TODO
Make sure save/load option works