merged branches, organized old/unused code