clean up code and add more lists! add cool feautres