partial implementation of expiration penalties
incremental implementation
mostly done
yep
Merge branch 'develop' into penalize
version bump