Cleaned up code a bit. Added storyboard implementation. Started annotation/highlighting feature.