feature is done
New branch for merging features
corrections were made
here goes first branch to merge!