Update: with some basic functionalities working