Getting some bugs out + testing