premerge
merge conflicts fixed
Merge pull request #43 from mnfienen/classy

Classy - had to make some changes in assign_layers