major updates, initial code gen up