Faimms refactored

@julian1 This is good to go. Looks like the metadata link below is broken.