Improved interface concept, starting to actually work