New OO design
New MVC desing
Added save