Cleanup
Renamed methods
Updated test cases
Added a DataLoader class
Added message loading via Loaders
Updated exceptions