safe fromJust. Logic errors fail hard now. Finished cleaning up record updating