Did stuff, might be working now. Please test.