butchered some things to get both platforms to compile with updated source.