avataraandy - these were originally separate files but then i...