Skip option implemented successfully. Done little code tidying too.