basic code finished and passed the make