Main commit

Added all the stuff