Added initial working library