Made all the things easier to use. Need to sort calendar stuff, then pull request this.