revamped, missing python stuff