Fleshed out the data structure for targets, changed some type declarations.