commited random unifinished changes because I am moving to a different computer