Just a few things left to polish up