Changed these two classes to allow for them to be seen with JavaFX,
Oracle YU such disconnect with these things