Updated, now with more test!  Yay tests