Completed most of the work, including JavaFX. Minor fixes remaining