2008-05-05 insilmaril Some code cleanup and experimental stuff to support animations later