Commented out work in progress code
Cleaned up code and commented out work in progress