Added more code, and bugs.

will fix soon (: