some more code added, all untested lolz