WIP - Partial completion of stateful FA