The codes a mess at the moment... but hey it builds

Signed-off-by: Dominic Baratta <dbaratta@buffalo.edu>