after class today, added more features and took out broken methods