maddy's stuff is in here now