Added a bunch of stuff...

...including 2/3 point shot detection!