Feature/28 day limit

Closes #138