#109 Skip functionality implemented