Made minor changes. Cant' test unless Ethan gets here.