FINAL FINAL TOUCHES FOR V0.1