Everything compiling and container tests pass 100%