I think it's fine as it is now. The capstone is now a proper capstone at last :D
Now you just have to playtest it or something...