Added files, needs major cleanup