Atef's branch is at operating capacity

I got atefs branch working, now I'll just make some more changes and
commit them, but use Atef's branch to test for now, don't make changes
until next commit, please, that will be in just a few minutes.