Removed/Commented failed generics attempt, some bugs fixed