i'll consolidate the model into a single data source tonight, break the code out into modules, and look at the builder vs fxml