FileGroups mostly workable. Need to clean up debugs and find other extraneous mumbo jumbo hanging around.