Added Everything but Still Has Bugs