Changed some access modifiers, TODO new better classes than this