Feature/josh 8

This should help I think