first commit

beta app nearly working