Moved Logic from TK to Gem - Needs test, and still a little work to get it up to snuff with all the TK features.