updated with notes from class
pulled and pushed back