Reverted previous commits because I should do this calmly instead