wip
adding in more test