Added in layer support and such

yes.