This is the entire eclipse project along with the old two files