skibbz1

Compilation of two existing mods into one.