working meld for single deck, fixed indenting on other classes
meld stuff actually getting committed