Reworked logic and added Interface.