Basic verbose implementation, and removal of dummy code