Genrics not working
Removed generic mess..
Works