First pass at getting linking to work