[Initial working version.
morten@nidelven-it.no**20100320210659] 
[Import
morten@nidelven-it.no**20100321123429] 
[Various cleanups, fixing name bug
morten@nidelven-it.no**20100321211606] 
