final commit 1

unfinished commit