v2.3! Structure stuff done. Needs testing!