Restructured instance maker ;)

Now includes fun with generics