Added a few things. Still very rough