Changes made to fit FA, some testing started.