Almost Done. Still some errors i need to fix