Preliminary Splitting
preparing to merge some code in master that was left behind
merged in master changes
Fixed infinite loop
working split merged with basic strategy
re-added some hashmap functions