Added more stuffs

Added stuff, rearranged stuff. Still a work in progress.