Generics problem fix & lot's more progress. The end is in sight?

Signed-off-by: Matthias Stevens <matthias.stevens@gmail.com>