Pushing all changes; branching to do different draw layers.