Dubs

NOT READY TO MERGE

Will push my updates to this ("Dubs") branch, so that you can swich to it easily.