Saving current, working state before making major changes to the code:
to make it easier to use