Updated and Tested

Migawari still needs work
update