Removed old implementation, connected to intermediate interface, added some components and fixed some stuff.