Big Update

Signed-off-by: Eric Martinez <eric.michael.mtz@gmail.com>