sprint 2 - 80%

Signed-off-by: brab0 <brabo.rodrigo@gmail.com>
Merge https://github.com/jaywalking101/mc