Test branch

i want 2 others to review this plz :)
convos here :)