Going the 2-stage route to make things cleaner.