Added block groups. Still need some work though