Adding stuff from other mac
fixing merge conflicts
removed/renamed for convention