Finished up Logic
Starting up Prop