Map Marshalling OK
CLeanup some Tests
Trello URL
UI enhancements