before changing stuff...
Add features!!