Closer to working… getting some invalid structures