Text/OAM

Here's dannye's stuff with iimarckus/master merged into it.