Fixed some linkages
MVP working