working on a few here and there