started adding some testing, needs implementation