Packages addes. Some manual merging with a Linux version