Working on messages and other fixes NOT COMPLETE