better naming, better tests
moar renaming
removed experiments and started first iteration