Finished the interfaces, removed comments for printing