Removed todo - Morten told me to do it!