Big Update

Please do not use this version yet, it's not finished