Updating to match the new style being developed. (Not much useful right now)