UPDATED! need more tests...msgs got lamer