Lots of work done, things split from one to many files, added lots of match stuff