Continued development, error routines not yet complete