Made significant progress on attribute checking, committing before major changes