Initial commit of working lib