stikis finished
merge fix
stikis merge fix
omfg! fucking merge conflicts
pffx1000