working on Windows now, looks good