Initial Release

A couple of bugs but working on it