Developing the remaining of the application