Added constructors and removed some static BS.