Still working on UI.
Commiting after someone made changes in my class.