Made progress on numbers recipe
Minor refactoring