finished cleaning up the backend, FINAL IS GOOD FOR NOW