More updates, adding base plate