Initial code merge

Added all existing code to repository