Added some bonus specs. Fresh implementation done during the deep dive session.