alan first commit here

merge this please