another commit

Still need to get parameters sorted out
params working

Algorithm logic still off somewhere