Cleaned up container "search". Still needs work!