Rough first cut, improve fluent syntax to keep in line