Change to Rifdhan's Code

Replaced all files with my current ones, this current code is not fully
functional at the moment.