Basic functionality made
Some renaming