Last working version before making a full clean up of the project. Basically, a new project will be implemented.