End of day commit, still a few basic functionalities that needs to be implemented....