re-structure contact solver

2 jobs for fullnscd in 5 minutes and 28 seconds (queued for 2 seconds)