First pass at regex
Fixed output to be more readable
Last changes-- ready for review