major restructuring, work begun on fork