Test code every so slightly improved. Do Not Use Yet!