Base commit with some skeletal work.