Tweaking up models, adding  menu model, deleting cruft. You're good to go.