added brett's work in - haven't consolidated yet