Cleaned up and added back expressions for the most part