Removed comments and started on interface