Getting some NPE's worked out and then we can get the rest working