Final commit for today. Everything works.

-- sign-off-- Martin Agnälv (martinagnalv@gmail.com)