Feature/foo

Merge me? Pretty please?