More progress, it sort of works