change return from list to object and crap
Merge remote-tracking branch 'gedwards/master'