SOA done, refine before moving on
Im lazy