Adding more logs, will replace with tests sooooooon!