Partial check-in

Still getting started. More errors to work through.