Added some basic functions, still WIP