Added constructor, and other stuff