Nearly done just working the fine details