just finished commenting stuff