Through and through working, still some major/minor clean up fixes