Added feature with current problems to fix