Ready/75

Boolean flags are always fishy, albeit I'm not yet familiar enough with the code to propose anything better. :)