So close

Almost done but two tests failing for strange reasons.