Rearranged stuff and added labels. still need to format, but GG have
fun.
Merge pull request #24 from rodrigjg/Jessica

Rearranged stuff and added labels. still need to format, but GG have fun