massive overhaul
adds lots of files