Working on testing...moving along