added throttle and emepty function to keep model view clean
sperated each event to have their own view, got tracks to show up for those events
fixed merged conflicts
Merge pull request #24 from smspezzano/upstream_master

Upstream master