Added project class and other misc. changes