initial pass at the restructuring suggested