Some important code relocations and the addition to a simple binding system...