Copying commented out code from other project

Will integrate this on other computer