More fleshing out. Time to start fixing compiler errors.