Sort of working package, functions are incomplete and need to be tested