Initial functionality working commit