Started reworking interface