653 socket units

Go ahead and pull this into master, remaining tasks to complete it can wait.