finished commenting out what needs to be comented