working much better. todo confirm signaturesgit add .! also some cleanup, more modularization