Updated WIP to reflect where we're at