Extract method - for new implementation. Not completed yet.