Done until stage6

stuff is working