Small Update

Added some code for parsing and so on