More decomposition.
Got build back working.