added some stuff, work in progress