Removed dead looping code. Started adding plan