WIP: New fangate logic