Adds moment.js functionality and checkbox for goals
fixes merge conflicts