Cleaned up Parser a bit, only thing left is arrays