completed crude inclusion of Chaitu's work
crudely merging the conflict I just ran into