Major refactor (Server Busy bug fixed)