adding method based testing option
stashing some changes so I can push them up, this is broken