final commit - think you can figure out the rest.