Initial Commit
Fixed huge bug