Start moving weight code into its own file.