Some more API work, adding windows...