More progress on this beast