Starting to add the todos
Added better code generators