Did some testing and stuff