Commented away work in progress code