Another try at fixing stupid date picker
Merge branch 'master' of https://github.com/ajk1311/ChaoticHippos
More work with duration/expiration