Added Translocators and cleaned stuff up