commit yesterday work, now starting new branch for finish up