It now builds cleanly, but I cut a few code stubs