Adding in default fa classes from master repo