Fix dup, get rid of terrible jumping methods to make way for better.