Commiting the canon nick module. Should work, needs somebody to look at it more closely before production.