Implementing core fc4j 2.0 functionality

[#80392902]
+1 to see if we can consolidate a bit of this.