Adding nearly-finished logic from Eclipse.
Adding nearly-finished logic from Eclipse.
Merge remote-tracking branch 'origin/master'