working on a few things...