Big Update

Most of the pieces are in place. Now just to string it altogether.