Finished toot

Many bugs to fix still