still working through a bunch of files (unstable)