Minor changes
Removed need for Fibers by using setImmediate instead