starting to parse the question for awesome styling
Merging from master