Now building!

Still need to test on Mac