Temporarily track test branches

Adds multiwindow support!