pass 1 working through bugs