Add tests, catch errors, you name it