Basic functionality working now

According to the limited testing that I have, basics seem to work now.