Revert "Revert these commits because they caused FC's on flo. Some of these might be good so it"

This reverts commit 5eb909b7d8b978b0940235fc78387d040343804b.