Feature/62

Merging work completed thus far in #62.