committing local code, made changes to main.php, added some classes, etc.