Working tboxes, no optimizations yet
Working tboxes and did some cleanup