Tests passing, minor updates still needed