Added static methods... Checked stuff working