Homogenise

This aims to solve #36