More debugging, forgot that addresses can be hexadecimal
Move address parsing to separate function