Adding description, preparing for refactor