Mostly works now except for comments