Further Parts added, still need to checkin the rest.

Yet driving home now, doing it in parallel with work so no rush for it.