Coding done, need to work on UI and unit tests