code with new inputs now compiles, fixmes remain