Imported into Eclipse workspace and updated a bunch of stuff.