Added more checks for 1-3. Still a long ways to go...