Add basic foundation to make things nice