Major refactor, added display of profile data