Wk2

Adding things to master.