parsed data
added comments for my spike
cleaned up layout of code on test controller
merge branches