Adding moment.js and doing more stuff