Updated build order and dependancies.