FINAL, cleaned up code, removed unnesseary functions,

DONE!