added more specs, this has become a mess