Started reworking it again.