Finished adding the FE-based classes