First commit on this branch, working on some test stuff for javaFX