Add verbose, remove unneeded variable

Start stubbing in data structures