Had to fix a bunch of stuff up, eclipse source file got mixed up