Reverted back again

Pulled in Victor's Files, still had some problems with it so I'm
pulling in the older commit file.