Before big change
Refactor into a basic constructor