Saving should work now, not ideal - refactor coming soon™