fixed working prototype 2
fixed merging
almost ready
almost ready