Merge branch 'typing'
Everythings working
Merge branch 'mapping' into typing
Merge branch 'typing'
Merge branch 'master' into mapping