more WIP - should compile now