This is a lousy commit, i really have no idea whats in it.

Probably should have been amended to an earlier one