Fixes #14

- #menu neede to be 100%
- Will merge now