More work on windows table stuff