Work in progress

almost there