More cleanup, implemented skips