Willie's commits

To merge after my work here is done.