Major updates with basic feature set implemented, no css