Added new contributors and made baby-steps more generic