Got the new stuff working, last commit before final pull push