Bug fix, going to implement more features