Made a couple of changes and still not finished ;-)