Bug fixing...
Back on this branch, ditched generics attempt