Clean up and working on fixing the tetra's not nesting issue.