Loads of Changes
Messages still being done though

Signed-off-by: karsanrichard <karsanrichard@gmail.com>