removed dependency on Andy's base and changed it to my own