Still working on a few things