reverted models back a bit to get rid of bad auth attempt, looking into new lib