supermaster
t Revert "supermaster"

This reverts commit 47fc12ef6332e312ae7bfa8d659a529d18aca493.
REVERT
fixin
it works sort of
change some view stuffs
merge