Committing current status of codes. Not sure if this is running smoothly or not. I also don't know what changes I have made for this.... fix when I get home
Adding uncommitted files