Redpointing/ need to clean code and add local username