Most recent work. Actually runs in eclipse, but not from cli