Final Commit for April 24th