Changing for endPoint
Just Indenting
Adding base64 utils
Properties first
Cleaning up code. WIP