Minor tweaks
Added testing recpie
HUGE re-write to generation code