first pass at making mac compatabile