Getting closer on the frontend, added some tests