Add test. Start implementaiton for something more, hmmm, less quick and less dirty