Basic functionalities finished