refs #5 Add logic for F type, intermediate commit