adding incomplete stuff from josh and sveinn