Many changes, and now one file...crazy I know