condition codes

getting hammered by merge conflicts btw lol