Added more data classes
Even more data classes
Final Commit of day