Adding tests...not complete, need to sleep. Big day, someday.