Basic Framework Update

Not Really Function Yet