Various changes, this build is expirmental