Feature/26

Merging work completed thus far in #26