Beta features

Very Buggy