Add initialization and finalization handlers to server
Merge calculator back