Same functionality as master branch now

+Having second thoughts about this branch...