Underlying code changes

Put everything under one roof, so to speak