major progress, still needs works