Updated with a lot of stuff

Signed-off-by: Rommel Alonzo <rommel.alonzo@me.com>