Feature/mavericks overhaul