adding stuff, updating tests