Adding skip and skip_if functionality

This will need to get cleaned up later, it works for now