Latest and greatest after a lot of changes, oops.