Everything working except error checking