Initial Commit
Fixed Bugs