The revised and finished project.  Partial credit to @JeffreyAdams