First pass at changing the obvious hardcodes