Feature/iss5

### Final Merge for the Presentation at IMEXPORT, there are LOTS and LOTS of stuff yet to implemment but we'll see @teamsleep @reyro @ivanespinoza