Updated challenge 1

Initial code was very messy. No valuable data was being returned.
Completely reworked solution