big update, consider this the first production release