Done!

main functionalities added