i am committing things for my baby!
again?
Adding some test cases to be expanded shortly