more yak shaving, need to be able to test for defined stuff
think I solved the collection issues