New object oriented code on its way, use old for testing purpose