End of the week update. Merging of Heimdall code into peasoup contonued.