Kind of built this out a bit more