Added quite a bit more
Merge commit '05129ae' into dev
Completed merge with Oliver's stuff