Use "" when including local header
Refactor whap and Matrix