moved address stuff in to control