Wrapping up the structure, moving to Huroku for client review