Split js files a little bit. Added new beats. Updated TODO's.
Merge