adding some basic parse logic