not fully working, but added stuff. Need to sleep for now