Added static fields, started working on constructor