Finished up some stuff, added stubs for calculator integration