Making things clear

Barebone, no functionality yet + little test case