Now handling Init, Cleanup, and signature issues !