Change this interface around a bit. Software architecture is tough...
Fill this in somewhat...