Final basic functionality commit