Weekend complete. Final update - including documentation