work in progress on #58
don't know if this is going to work
well it compiles...

doesn't mean too much tough...
some progress on #58
Address #58