Adding better messages WIP. BUGGED.