This is the full beta 2 inspired by matt team