I really don't like the OAM
Remove nested struct stuff as it's interfering with alignment
Merge branch 'elly-graphics'