Added all relevant classes + basic menu interactions