Cleaned up, IP Addr implemented