Fix (70%) step implementation + README up