stripped some stuff out, added names to project