Finished everything. Working correctly now