A couple more pieces done for FFG