Still trying to work out the bugs. Continuing the Mac port