Exp branch

Thanks to shoes i was able to make all the changes to the code