Final

Lightning added, final cleaning up.