Fix
Updated API to be more Cocoa like