Removed superfluous interfaces. Started work on actual implementation