Initial attempt at version 1.6