Added most basic functions