Updated to actually use the shiny new API