Somewhat a update for 1.7. Still with a lot of commented code and
ununsable code.