Could use a hand cleaning up this mess