Beta 2

Uppercase support. I think I need to sleep but effort.