controllers almost there
contollers tweaked more