WIP: Added more bars & beats