pretty large changes... bunch of stuff... plenty isn't working... thomas don't modify for a bit longer