Added readme, removed complexity, added some tests