Rates working. Still need some cleanup.