Painfully working on testing