testing
fixing merge
finishing up mac