Add save! method
Add some todo notes