Starting to flesh out the different models
Note about what needs to change in the future in the splicer
Fixing problems with migration to Java 7