MESSAGES WERE NOT HANDLED PROPERLY - PLEASE FIX THIS!