Commit before ripping apart AssetPrices architecture