implemented a couple more, and removed one I just got