Batteries Included project (a bugfix fork)