Cleaned up my code a little and started looking into the second task