oops had a bug, commented folder stuff out for now