Refactored Nowplaying collection into properties on State collection