First pass at new setup

IP resolver doesn't compile. Will fix later.