The location stuff in CreateEntry mostly works now....needs A LOT of fine tuning though, but at least the bread is buttered.