Second attempt ate object conversion - should probably sort out some testings :p