Changed way input works to use messgae class
Fixed merge confict
Fixed up merge error