Refactored to fully integrate Curacao into Havalo ... replacing 'servlet closure'