Commented out stuff / maybe will fix