updated more of main.  need tests