Added Commander (Testing) - But I don't want to spam up the main class!