More refractoring, Layer methods + first tests