Added interfaces, classes, added TODO comments