More hacks, time to implement basic function now that it loads