added wakizashi
resolved conflicts
adding working versions of tape_fetcher
resolved
first working parser