Working V0.7
Bug fixes again >:(