Added stuff.
Started Refactoring into another project.