added some stuff, but won't compile..