tried to get normal mapping working
- moved some more test code into static methods