Finished this all up. Everything works