Rough api search implementation. POC
Cleaned up container "search". Still needs work!
Merge branch 'master' into container_search