initial recognition work
Merge branch 'funtimes' into recognition
WTF.