Putting commented out stuff back. Will likely use soon