Redid some files

Files being redone
Testing

test