Thanks guys, updated and squashed my commits.