fixing stuff so it compiles; not there yet