Fixes #11 - Incomplete IOM functionality present