cleaning up code, moving more code here, small change to finesse file

2 jobs for master in 21 seconds (queued for 6 seconds)