Initial comments and changes from aaron. Also uncommented out the database code