finished first pass at blockchain integration
merging project changes
merging project changes