Added many aditions w/ Matthew and Richard