Added Flag Checking

Eliminates adding flags over and over etc.