moved in sections
cleaned out comments and stuff