Feature/af7

Closes #188