started working(no changes from yours)

in need of commiting this...