Work in progress
Address functions working