got tests working- still A LOT to do...