stuff
merge
some changes wip
laptop version
merge changes
added libraries