All my work from sunday
Pull and merge Tina's stuff and resolve conflicts