mega update - God, I am programming like cray lately