Lil refactorig and blood fix.