Finished Some More Code