started refactor of instructions