Beginning to implement some new functions