Initial Commit
Fix issues
Added more tests and data