Added POS vars and took stuff out of main