Begin modularising Interface
merge issue