Big bad WIP
Merge branch '3d' of github.com:stompchicken/lichtenberg into 3d