initial commit

starting to merge to new design