Some work on @Thayli's fluid commit