Work in progress
Fixed relocation
Fixed recursion