WIP: started adding bart