Adding more code... a work in progress