First merge

Moving modules one at a time - will update this PR as I go along