Re-factored generators. Still WIP, sample app is currently not working