First pass at syntax for families
Start cleaning up after sigma hell
Further cleanup