Added basic server list, and added yield calls