Starting a partial interface refactor to get angular integrated