continued reworking everything
forgot to add some files