Started work, see TODO in JavaMain