Commit of all new changes to allow work on Laptop.