Almost working
Adds fixes
Adds insturctions
Merges