Getting close to having it work properly...