V0.4 Big Changes

Big changes