Finished 3_5 for now, changed structure a little