OF error parsing looks to be complete? Closes #16