Initial commit version 2. Working model and controller. View needs to be implemented.