Switched the base10 preprocessor macro to base2 and base16 - base10 is redundant now, but base2 and base16 might actually be used