Re-doing the whole project again, this is when i left off