First commit with basic functionalities