Merge from dan to master

More stubs and such