Major Refactor Started
Unit Testing
Adding Properties
Latest Swagger API Update