Finalized Project
updated interface
merged conficts