More code added, almost finished