Laptop

merge this into master