reduce method complexity
array designator should be on type not the variable
unnecessary call to superclass
remote todo
additional tests
Merge branch 'feature/issue-39' into develop