REDO

Attempted to fix the repo. Please commit only the necessary from here
on!