Added rudimentary skip support
Fixed a few issues with the skip feature